Colt's Commit Message
Merge pull request #7 from Colt/master

Colt