minor changes
Merge branch 'master' of https://github.com/Colin-M/organikframework