clean up
Merge pull request #20 from mihassin/master

clean up