Update to work with both L4.1 & L4.2
Merge pull request #16 from kfuchs/patch-1

Update to work with both L4.1 & L4.2