Update 36/03

123
Merge pull request #9 from mrcupid12/MrCupid

Update 36/03