Merge pull request #50 from Apelon-VA/master

pushing sprint work to gold
Merge pull request #51 from Apelon-VA/master

pushing sprint work to gold