first commit using NetBeans
Merge origin/master