Merge pull request #17 from MartinSenne/master

Auto-merged. Looking through changes now.
Removed some uncommeted code that is not needed anymore.