Pchibilsqui's back to save us
Merge pull request #2 from AlexLusitania/master

Pchibilsqui's back to save us (but not totally)