Bug fix

file include bug fix..
bug fix
Bug fix

some minor bug fixes
Merge pull request #67 from liboud/master

Bug fix