Merge pull request #39 from spderosso/master

some cleanups