fixed #146
added feature #129

fixed #146 added feature #129