resolved problems and refactored
Merge branch 'master' of https://github.com/icaruus/il12a