Adding fixes for the latest L5 updates
Merge pull request #69 from darrencraig/develop

Adding fixes for the latest L5 updates