Changes due to Issue #22 : Refactor libcss