Added convertion for plural case. More protective guard and a few tests.