Finish the method which was not fully implemented on issue #13
Finish the method which was not fully implemented on issue #13