Merge pull request #12 from Apelon-VA/master

pushing sprint work to gold
Merge remote-tracking branch 'upstream/master'