backup branch
pedantic warning fixed