Merge pull request #76 from anders-dc/master