0.2-0 final
Merge pull request #17 from snoweye/master

0.2-0 final