0.5.0
Merge pull request #1347 from matiu/ver0.5.0

0.5.0