Merge pull request #2 from freeoasoft/master

2014-6-6