Merge pull request #8 from FutureTemp/master

Merging changes from master to 0.1
Merge pull request #14 from FutureTemp/0.1

Merge pull request #8 from FutureTemp/master