20130923
Merge branch 'master' of github.com:weedbitter/ckpre
20130923