bugfixes for Neko
Merge pull request #416 from raivof/master

bugfixes for Neko