Fixes #3

Review and merge my changes