Merge pull request #1 from taylor/master

bug fixes for 1.x release, refactor, etc
Merge pull request #19 from vulk/master

Merge pull request #1 from taylor/master