Merge pull request #1 from jhollister/master

commit fixing errors