Fixed minor issues relating from pull request (#31)