Prepared methods and refactor
Prepared methods and refactor
Merge branch 'master' of https://github.com/marc-inn/alhe