Merge pull request #1 from Apelon-VA/master

pushing sprint changes up to gold