Added support for specifying multiple shapes in 1 shape file
Merge branch 'feature/oasis-style' into gh-pages