Merge from `developer` to `Master`

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