Fixes #9 - Moved options parsing into module