Resolves #226
Merge branch 'master' of github.com:atuttle/Taffy