Merge error fixed
Merge pull request #9 from pweisenburger/master

Merge error fixed