enjoy, about finished
Merge branch 'kinjee-mac'