Fix compiling errors
Merge branch 'master' of https://github.com/mingthor/coding
Merge branch 'master' of https://github.com/mingthor/coding
Merge branch 'master' of https://github.com/mingthor/coding
Merge branch 'master' of https://github.com/mingthor/coding
fixes