Merge pull request #21 from wking/make