Merge pull request #9 from Apelon-VA/master

pushing sprint work to gold
Merge pull request #10 from Apelon-VA/master

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