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

This reverts commit be9a54b98e6b244b51081dc1893e7131683d77d4.