Merge 0.1.2 code in develop with master