Additional improvements and unit tests
Merge branch 'master' of https://github.com/RRGWhite/IRDM.git
Some changes