mwild1 Merge pull request #1 from daurnimator/master