Merge pull request #218 from andschwa/remove-sln