fixing broken merge
clearing miss placed line
Merge pull request #154 from narkisr/master

Fixing broken merge