Merge pull request #22 from TrentBartlem/master

Monthly merge