Merge pull request #66 from omor1/master