Merge pull request #39 from hettling/master