Fix some bugs
Merge branch 'master' of https://github.com/renquinn/tmp