Merge pull request #57 from Apelon-VA/master

pushing sprint work to gold