Tagged release v3.0.4

40eb123 Update Makefile according to ci changes
d8240f2 Update ci according to template refactoring