Merge pull request #24 from kusor/v6.5

Upgrades to work with node v0.10.x