merge pull/176 For Issue 232