Merge pull request #14 from fcfe/0.0.2-dev

0.0.2 dev
Merge branch '0.0.2-dev'