Hardcoded values removed.
Merge branch 'master' of github.com:ppold/lambtastic