vic's changes
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys