Merge pull request #8 from FutureTemp/master

Merging changes from master to 0.1