more bugs...
Merge gitHub/master
addAPP