remove serial number
Merge branch 'issue-196' into develop