R_and_M
Merge pull request #4 from Ninjah45/R_and_M

R_and_M
R_and_M
Merge pull request #5 from Ninjah45/R_and_M

R_and_M
merge from master