140206-1
140207
fixed looping bug
Merge remote-tracking branch 'gitdemo/master'