Fixed merging error
Merge pull request #22 from Basert/master

fixed bugged merging