Changes: - Add examples about annotations - Make the public API c++ friendly - Fix bug in solver found by the ruby 2.1 upgrade: puppet getting removed when it should not