Fixed crashing under Windows
Merge branch 'master' of https://github.com/clixx-io/clixx.io
Merge branch 'master' of https://github.com/clixx-io/clixx.io