Revert "Revert "Merge pull request #1 from ttscoff/master""

This reverts commit f16ea991700d85a6f7eac8948ef66092c979a592.