Merge request issue #40 + Some Light Cleanup

#40