Merge pull request #19 from Vlemert/dev

Dev work
Merge branches 'dev' and 'master' of https://github.com/Vlemert/LAMP-Pebble-Configuration