Version 1.0.2
Merge from dev