Merge from `developer` to `Master`

ef398bbcd9c15c30dc0876b7ca4b58450725a5e0 : changed to file contents encoding : ANSI -> UTF-8
b449ebc17a00e50130ea7c720b0bd5a7cb756cf7 : Fix bug #17