commit from njpc
Merge branch 'master' of github.com:nightost/goldenEggNew