Merge pull request #1 from ligershark/master

Merge latest from ligershark
Merge pull request #9 from sayedihashimi/master

Merge pull request #1 from ligershark/master