close #37, close #36 History Integration
Merge branch 'master' of https://github.com/seagullua/YAD-Studio