Merge pull request #8 from Apelon-VA/master

pushing sprint work to gold