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

merge from origin~