Merge pull request #2 from brycecr/master

fixing issues from last PR