Merge pull request #25 from mdeboer1