Bugfix 2
Merge pull request #2 from bbedwell/bugfix-2

Bugfix 2
Merge branch 'release' into dev