update from master

missing pom and a bug fix