Merge pull request #100 from RickSBrown/master

Ports from aria-toolkit and enhancements
Have fixed all the nits. Merging it. Will address some of the TODOs in my next pull request.