cleanup
Merge pull request #1 from piatra/master

cleanup