Update to meet staging forge requirements
Merge pull request #28 from cyberious/master

Update to meet staging forge requirements