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

Bugfix
Merge branch 'release' into dev