fixed merge with issue#15