Merge branch 'release/0.2.0'
Merge branch 'release/0.2.1'
Merge branch 'master' into develop
Added unit tests. Made helper methods private as per Oscar.