Merge pull request #87 from mousavian/master