fixed gcc 4.6.3
Merge branch 'master' of github.com:davidmoreno/onion into websockets_refactoring
Merge pull request #25 from andrew-aladev/websockets_refactoring

Cosmetics gcc 4.6.3