Merge pull request #7 from MarwanG/master

clean up