Merge pull request #98 from davidkassa/master