Merge branch 'develop'
Update Changes file
Merge branch 'develop'
Version 0.21
Merge branch 'develop'
Up version 0.22
Merge branch 'master' into develop
Update Changes
Fix "after list" elements