Merge pull request #96 from medaved/master