Fix for implicit if/try
build
Add test and bump version
Merge branch 'master' into gh-pages