bug fix
definition fix
Merge pull request #216 from jpecht/master

fixes