Merge pull request #6 from elyas-bhy/develop

Fixed #4 and #7
Merge branch 'master' of https://github.com/idrc/tagin into develop