Merge pull request #1 from icattlecoder/develop

Develop
adj dir
Merge remote-tracking branch 'origin/master' into develop