Merge branch 'release/0.3.3' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
adding tests and documentation for Bouke's patch
bumping version number to 0.3.4 for release
Merge branch 'release/0.3.4'