Quick fix/changes
Merge pull request #37 from MilloLab/0.6

Quick fix/changes