Merge Pull Request #7 from Randomfish132-master