Merge pull request #1 from Apelon-VA/master

push up to gold