Updated to make the project installable by maven