Merge pull request #6 from Apelon-VA/master

pushing sprint work to gold