Updated to the latest version.
Merge pull request #43 from lukabratos/master

Updated to the latest version.