Merge pull request #2 from eltados/master

Merge up
Merge pull request #17 from Kandankabuz/master

Merge pull request #2 from eltados/master