more bonuses
fix travis
fix travis
Merge