Merge pull request #2 from thedjpetersen/master

Merge with master