Fixes #1
Fixes #1

Added fix for -l too
Merge pull request #2 from rborn/master

Fixes for #1