Merge pull request #40 from MilloLab/master

FIX changelog
Merge pull request #41 from MilloLab/0.6

Merge pull request #40 from MilloLab/master