Back porting some changes from pro.
Merge pull request #18 from methnen/scriblio-pro-sync

Back porting some changes from pro.