Merge pull request #116 from ooeygui/develop

Minor content updates and bug fixes
Minor content updates