0.6.0 compatibility

After merging, `git checkout a6cf0a8 && npm publish && git checkout master && npm publish`