bugtracker 0000084
Merge pull request #140 from sigal/master

bugtracker 0000084