Finishing the implementation of the issue #5.