Merge branch 'Armour-master'
Merge pull request #6 from lbenzene/master

Merge branch 'Armour-master'