Updated to latest version
Merge pull request #1 from Isklar/master

Updated to latest version