v1.0:2-RC
Implement helpers functions

also contains issue #11 bug fix
Merge branch 'master' into develop