Updated to latest upstream
Merge pull request #20 from mbacovsky/0.1.8-update

Updated to latest upstream