Fixing merge mess
Merge pull request #8 from armannds/mergeFix

Fixing merge mess