Merge pull request #1 from Apelon-VA/master

pushing sprint work up to gold