Merge pull request #20 from pooriaazimi/merge-branch

Bold XBZar