Merge pull request #43 from rphitt1/master

nothing major