fix #38
included new class from 2 commits before