John mai master

merging johnMai master branch to my master