Merge pull request #1 from jordandeang/master

PullRequest1