Correctly handle functions and implicity if/try
build
bump new version
Merge branch 'master' into gh-pages