most recent changes
Merge pull request #1 from Iddah/master

most recent changes