implements changes from
https://github.com/FallenMoonNetwork/CanaryLib/commit/87181e055197448e7701bfbb865a6b0ec32e403a
Also changes to pom