Merge pull request #34 from eastfire/master

update