Added patch with solutions to the problem to the original version provided by the Authors