Fixed #12 and added 2 new methods:  and