Merge branch 'release/0.3.1' into develop
added safeString decorator
bumped version
Merge branch 'release/0.4.0'