Merge pull request #1 from stardisblue/dev

qsdf
back to master
Merge pull request #2 from stardisblue/dev

final
Merge pull request #3 from stardisblue/master

qsdf