Added travis ci badge
Fixed bugs
Cleanup