Merge pull request #1 from freeoasoft/master

2014-4-6