Merge pull request #54 from Apelon-VA/master

pushing sprint work to gold