ernestguevarra Merge pull request #65 from katilingban/v0.5.4