syrusakbary Merge pull request #71 from kojix2/kojix2-patch-2