Merge pull request #2 from fcfe/master

merge to dev
Merge pull request #3 from fcfe/dev

Merge pull request #2 from fcfe/master