First Development Branch Merge. Based for NetBeans Project