Fixed issues of pull-request, as per aaronrandolph's comments.