Merge remote-tracking branch 'eoeschool/master'
2012.12.26
2012.12.27
Merge pull request #35 from Robert-Lwf/master

hello Iceskysl