Merge pull request #3 from hmakauskas/master

Merge 3