Feature pebble support

Replace PR #861 and fixes the issues with Travis CI.