Merge pull request #89 from jashkenas/netbeans

Netbeans
merge and update CHANGELOG
Merge pull request #90 from jashkenas/master

merge to master