Merge pull request #14 from JyunjiKondo/master

Some fixes
Fix pre build fail under Travis CI