Merge pull request #1 from atlastory/master

Requesting most recent changes