chrisaljoudi Merge pull request #10 from mRs-/master