Revision of the solution to issue #69.
Fixed some concurrence issues and updated some comments.