Merge pull request #23 from TrentBartlem/master

semi-regular merge