Fixed issue 385: cosmetic changes