Merge branches 'fix-text-styles' and 'development' into fix-text-styles
Fixed font styles. Closes #61.
Merge branches 'development' and 'fix-text-styles' into development