keep 6.0 pushes consistent
Merge pull request #7 from albumatic/development

keep 6.0 pushes consistent