Revert "Revert "Merged pull request #9.""

This reverts commit e4fd540285cb7c6af03d10c6cb696ebc60f54a85.