Merge pull request #1 from jordanlm/master

want