Added two files
Fixed warnings