Merge pull request #20 from FutureTemp/0.1

0.1
Merge pull request #21 from FutureTemp/master

Merge pull request #20 from FutureTemp/0.1