refactoring (code doesn't compile)
refactoring: use FactorValues instead of Strings. Still need some review
Merge branch 'master' of github.com:gxa/atlas