Make core by netbeans
Merge origin/master