Added missing files from last commit (NetBeans screw up)