story merged
Merge branch 'story' of https://github.com/HummingTop/doresol_hybrid into story