Updated to latest version
Merge pull request #161 from Bogatinov/master

Updated to latest version