Modify to use internal method, add some comments
Bump to 0.2.4