Get spritz working
merged master