Maven configration
Merge with master