add travis support and a test case
Merge branch 'develop'