Revert "Revert "Merge pull request #2 from Ishap/master""

This reverts commit 1ddf07025b2e8070c5c5421599eaf04a021ac9c0.