New commit through Netbeans
Merge origin/master