Updated for maven, intellij, mac and eclipse