Merge pull request #55 from Apelon-VA/master

pushing sprint work to gold