merging conflicts fixed?

Visit #17
Merge pull request #22 from zD12/patch-17

merging conflicts fixed?