merge from ras2
Merge branch 'master' of https://github.com/apps4av/avare