Minor on-page optimization
Adding in options (closes #3)