Fixes related to latest modern syntax changes
Merge pull request #59 from kylef/bugs

Fixes related to latest modern syntax changes