fix bugs 203  and 224, adaptations for maven 3
5 files changed