Fix #312
Add strict type checking to channel options
merge master into roompassword