fix
Merge branch 'develop' of github.com:kienbd/snap into develop