Merge pull request #28 from philburk/fixdevid