Merge pull request #2 from mola/master

merdge and update
Merge pull request #5 from ruhollahpython/master

Merge pull request #2 from mola/master