Merge pull request #37 from radixrat/main