Merge with Dev 0.3.5