Merge pull request #1 from KurzonDax/master

Major changes to most aspects.  See change log for detail.