mavenized

applied changes from test branch