Merge pull request #4 from Hoier/master

Merging for bugged commit.