Merge branch 'maven' of https://github.com/alexandreab/APBGCS into maven