Merge pull request #9 from cdondrup/master

Works fine on Linda and does not change the default behaviour.