Feature for #gt-15 done. Fixed #gt-15 Fixed