closes feature #6