Merge pull request #62 from zshehri/master