Mix branch 20140623, fixex #1

new branch init commit
keep original