Ignore netbeans project files
Merge origin/master
Update readme for version 2.0