Real solution to issue #49.

Created by: acompa

Okay...not sure what happened before. Reset a few commits on my end, then re-committed. For future reference, multiple commits for one patch are fine?