Merge pull request #1 from caseycannon/master