Merge pull request #98 from cuss/CORE15

CORE15