Merge pull request #1 from jordandeang/master

PullRequest1
Merge pull request #1 from mantism/master

Merge pull request #1 from jordandeang/master