Merge pull request #1 from slick/master

merge slick/slick