Improving reset classes and fixing issue #13