Feature 6, na release 0.1
Merge branch 'feature6' into develop