Issue #103 Change-Id: I67945c8ec6d2c178494d3b5400e5ec0170e9d115
Make it easier to be included and integrated into other code. Change-Id: I609881688cc20f8fac676cbd91fde4753af32ee5