0.6.0 compatibility

After merging: `git pull && git checkout HEAD^^ && npm publish && git checkout master && npm publish`