Bug fixed
Merge https://github.com/annettaws/abstraction_layer_bundle_protocol