cleaning up
Merge pull request #122 from vciulli/master

cleaning up