Merge pull request #7 from Cofyc/trailing_spaces

remove trailing spaces for diff
Merge pull request #8 from Cofyc/kqueue

Kqueue
remove testmap