Merge branch 'maven_structure'. Fix #2