Merge pull request #86 from soyuka/master

fix #66
0.2.4