last changes
Merge pull request #28 from khan4019/master

last changes