New idea and netbeans ignore
Renamed for consistency
Merge remote-tracking branch 'gh/master'