Merge pull request #6 from fcfe/dev

0.0.1-alpha.17
Merge pull request #7 from fcfe/master

Merge pull request #6 from fcfe/dev