Update Issue #40 fixing compilation issues