merge master -> free
Release 1.0.14 Free