working on last changes
Merge branch 'master' of https://github.com/xavocinternational/alk2