#4 working in maven 3.1
#4 reverted changes to existing classes, moved changes to new files
Merge pull request #7 from krzyk/4

#7: pull request #4 working in maven 3.1