Minor fixes
Version 1.2.0
Merge