Merge pull request #10 from tfhartmann/master

Version 1.2 upgrade with numerous fixes and adds