Merge pull request #45 from Apelon-VA/master

push up to gold
Merge pull request #46 from Apelon-VA/master

pushing sprint work up to gold