Merge pull request #2 from dehnert/master