fixed removeAll
Merge branch 'master' of https://github.com/camerondunn/OSP4