Merge pull request #13 from hettling/master