Closes #173 - Small language changes