Merge pull request #32 from lauterry/step-1

update from upstream