fixed merge mess
Merge pull request #11 from alv-ch/cleanup-of-merge-mess

fixed merge mess