Merge pull request #38 from barisusakli/master

no idea what im doing
0.6.2
0.6.0 changes