Merge pull request #2 from Apelon-VA/master

push latest to gold