Minor fixes and fix #34
Merge branch 'master' of github.com:mozillahispano/openwapp