Merge pull request #54 from RaulLepsa/master

Follow-up for #45