Merge pull request #1 from eltados/master

Merge up
Merge pull request #15 from Kandankabuz/master

Merge pull request #1 from eltados/master