a little bit of cleanup
Merge pull request #20 from kheradmand/master

a little bit of cleanup