Merge pull request #146 from wmiltenburg/master

Fixed keepalive JSON object
update CHANGELOG
fix bug with default route
better version of the same fix
Merge remote-tracking branch 'upstream/master'