fixed #146
added feature #129