Merge pull request #5 from Apelon-VA/master

pushing sprint work to gold