Merge pull request #31 from lauterry/step-0

update from upstream
Merge pull request #4 from Sfeir/step-0

Merge pull request #31 from lauterry/step-0