sma fix
Added fix for overriding in array
Merge branch 'master' of github.com:VidTech/LeyniRepo