Springified
Merge branch 'dev' of https://github.com/bbytes/DAAS into dev