Merge pull request #53 from aikeru/master

Some cleanup. Maybe even a minor bugfix - bad variable name.
Merge pull request #54 from aikeru/master

disconnect cannot tolerate certain types. Fix (hopefully correct) one of...
Fixed bad !