Merge branch 'master' into develop
getReactive()
part way through refactoring
misc bugfixes
fixes #18
fixes #19
Merge branch 'pre-release-0.2'