Merge branch 'dev_dboy' / close #5