Merge pull request #26 from juljun14/master

Add travis/ci