Minor change for input checking
Merge branch 'james_branch' into dev