Merge pull request #1 from UberNuke/master

p1
Merge pull request #2 from UberNuke/morco_branch

Merge pull request #1 from UberNuke/master