Initialization
Merge branch 'master' of github.com:houhr/Armour