Merge pull request #1 from josuer08/Minor-fixes