new feature fixed #81