Merge pull request #3 from kedromelon/noah_develop

Merge noah_develop