Merge pull request #37 from Apelon-VA/master

pushing latest up to gold
Merge branch 'master' into release-prep