Revert "Revert "Pull request #16""

This reverts commit abfab6c7ec91853a3f8a4a49438c5a72f00e3795.