Minor syntax and grammar fixes
Merge conflicts from Pull #50
Merge branch 'kargakis-develop' into develop