Merge pull request #11 from kedromelon/noah_develop

Noah develop