more option, less hardcoded stuff.
fixed last attribution

Signed-off-by: Martin Ankerl <martin.ankerl@gmail.com>