fixed issue #125
updated excludes in pom.xml
Merge remote-tracking branch 'upstream/master'