Updated to SDK 19
Issue #34
Minor refactoring
Merged conflicts from upstream
Merged conflicts
Changes to version number
Merge branch 'dev'
Switched off debug flag