Recent updates

Please don't merge it until travis works fine.