Merge pull request #19 from Centril/master

Fix #18 & #16
Update build output
Release v2.2.0