Use single quotes because no substitution necessary
Small refactoring in order to create first tests
Merge pull request #1 from vondeetzen/master

Enable testability