Fix issues
Add maven support