Add headless option and closes #130