added input checking
Merge remote-tracking branch 'origin/testing' into testing
Merge remote-tracking branch 'origin/testing' into testing