Merge pull request #67 from drobbs/master

Various Functionality Additions and Fixes