Changes as suggested in Pull #71 comments