Merge pull request #101 from karturov/master