Merge pull request #16 from Apelon-VA/master

pushing sprint work to gold