Merge pull request #58 from Apelon-VA/master

pushing sprint work to gold