Manual merge of pull request #5 via @andrewshadura