Merge pull request #53 from marttipiirainen/master

Revert accidentally merged files