Revert "Merge pull request #10 from Martin819/master"

This reverts commit 0a7dd0272fa15fc67d71ff72628125002d16662c, reversing
changes made to bcfb20f4e9ac8b88fe838c1fc9600f48e2826fb4.

Change-Id: Id8a16e8bd3f8c25756ec3841d14ff4a09c47010c
8 files changed