Updated to 1.2 w/ passing tests

Made some updates based on @swistaczek's changes from pull request #67