Fixed to work with newer lightning version
Merge branch 'development'