Merge pull request #3 from HmmmQuestionMark/master

All the fixes I forgot to send to you.
Merge pull request #2 from alexbennett/master

Update to latest.