Merge pull request #42 from Apelon-VA/master

pushing up to gold