added options & bugfix