Update development
Merge branch 'master' of https://github.com/barrocit/barrocit