Better working version but not quite yet --kazu
Merge branch 'trunk' of github.com:/larlight/LArLight into trunk