v0.8 commit
Merge pull request #1 from sudodoki/v0.8

v0.8 commit