Merge branch 'origin/master'
Merge pull request #5 from manalink/develop

Merge branch 'origin/master'