Pro update and other fixes

Pro update and other fixes
Merge pull request #63 from mfunk/master

Pro update and other fixes