Merge #2 make spring works