Merge pull request #36 from EricWittmann/master

Minor updates