Merge pull request #32 from lauterry/step-1

update from upstream
Merge pull request #5 from Sfeir/step-1

Merge pull request #32 from lauterry/step-1