Merge branch 'issue/#10'