v1.2.1

Missed file
Merge remote-tracking branch 'origin/dev'