Merge pull request #1 from OLIMEX/master

同步OLIMEX代码