fix bug, combine lines
merge in fix into updated mainline
Merge pull request #4 from fjh2/fix

this should work, fix is merged