0.6.2
Merge branch 'nan-1.1'