Merge pull request #40 from amarkevich/spring-security-4