Merge pull request #24 from eastfire/master

update