Revert "Merge from head fork"
Merge pull request #2 from arnestig/revert-1-master

Revert "Merge from head fork"