issue 58
Merge pull request #60 from dev2geek/master

issue #58