Merge branch 'issue/#54'