Added the comp. layer. Closes issue #49