Added <<complete>> behaviour for merging
Merge branch 'master' of https://github.com/DurandA/drttor