Merge pull request #85 from sneumann/master

Please pull our latest additions