meging changes
Merge branch 'master' of https://github.com/issyzac/Accapp
merging changes