Merge pull request #12 from dmeltzer/master