Merge pull request #1 from aldee/master

Update
Merge pull request #2 from haydarai/master

Merge pull request #1 from aldee/master