Fixed some (but not all) neko bugs
Merge remote-tracking branch 'origin/master' into dev