applyed modification from Version 2.2b, originally released on 2013-06-27
applyed modification from Version 2.2.1b, originally released on 2013-11-04