fast locke
kant rewritten
Merge pull request #746 from luixxiul/development

fast locke, kant