This commit resolve #1 issue