Merge pull request #6 from mhd0003/master

Merge from master