Added fixes for https://github.com/zurb/foundation-apps/issues/255 in this feature also