Merge branch 'topic/pull_request47_adsj'