Merge pull request #25 from spderosso/master

Addressed some comments + other misc changes
some fixes