reem Merge pull request #8 from notriddle/master …