Dear @justacec, I made a few changes. Would it be possible for you to merge them into the master branch?