Merge pull request #65 from Dmytry/dmytry_github_master