2 days of work, good job everyone
Merge pull request #28 from WhaleMonster/kevin

2 days of work, good job everyone