irjudson Merge pull request #1 from cloudbeatsch/master