merge alexkuang:master into mochify:master

- Add travis
- Minor fixes and features