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

merge from origin~