Merge pull request #1 from RzhanRichardZhan/richard

added some stuff
changed stuff