todos + some cleanups
Merge pull request #12 from spderosso/master

todos + some cleanups