Better string handling
Merge branch 'master' of github.com:spring/RapidTools