Merge pull request #206 from ryanrhee/master

Small misc. fixes