merged from develop
merged from develop
merged from develop
cleaned up pom, readme