Fix #16
Merge pull request #17 from vgeorge/custom_layers

Fix issue #16