Make it working with latest Arduino