starting to improve expansion
Merge branch 'master' of https://github.com/curopium/Marvin