merge fix 5
Merge pull request #35 from Zichsah/noah

merge fix 5