** Fixed issue #83
** Finetuned issue #83