a0m0rajab Merge pull request #37 from Okuyun/a0m0rajab-patch-1