Merge pull request #1 from Apelon-VA/master

Push everything up to gold