major code refactoring
Merge branch 'master' of github.com:darkain/altaform-core