Another bug bites the dust

(the song is now stuck in your head)
Merging the merge

Pushing the pull?
Merge pull request #79 from originalnick/master

MOAR