removed useless function wrapper
thoughts on next directions
Merge branch 'master' into gh-pages