Revert "Merge pull request #2 from fcfe/master"
Merge pull request #4 from fcfe/revert-3-dev

Revert "Merge pull request #2 from fcfe/master"