Added handling to more than one Main method
Some eclipse bullshit (no real changes)