epage Merge pull request #15 from epage/custom …