Merge pull request #31 from lauterry/step-0

update from upstream