Added support for options. Fixes #8
Formatting
Versioning update