Merging Amir's pull request (#6) back into master.
Applied a minor naming convention fix on Amir's pull request (#5).
Added a new test case.
Updated list of contributors with Amir Karimi's name.
Rebase