Fixes and comments
Merge branch 'master' of github.com:asakin/guacamole