Merge pull request #2 from BlackLamb/master

Update to compile and sometime run under pebble 2.0