Merge pull request #2 from nerdishbynature/master

A few improvements