Merge pull request #6 from fcfe/dev

0.0.1-alpha.17