Merge pull request #9 from dougwig/master

0.5
fixed 0.6