Merge pull request #143 from RoEdAl/master