Added catchall for OPTIONS
Updated pom
Merge v0.2