Merge pull request #6 from mhd0003/master

Merge from master
Merge pull request #7 from mhd0003/jordan_Branch

Merge pull request #6 from mhd0003/master