Merge pull request #48 from Apelon-VA/master

pushing sprint work up to gold