Should fix issue#113
Merge pull request #120 from samuelgarcia/0.3.x

Should fix issue#113