Merge remote-tracking branch 'origin/pr/5'
Move all application code to static callbacks
Fixing travis