fix #3 added missing returns
fix #3 again, corrected return varible in accessor
Merge branch 'master' into gh-pages