Corrected botched merge.
Merge pull request #57 from DanielStolt/master

Corrected botched merge.