Contains fixes for the issues #253, #258