fixes quickstart
merged with master