Dev 0.1.3

merging new changes 11614-547pmest