0.2-0
Merge pull request #18 from snoweye/master

0.2-0