Refactoring.
Merge branch 'dev' of github.com:peoplesbeer/String into dev