Closes #243 (closed)
Please note that following changes have not been done because of lack of information: