smith into 2 parts
Merge pull request #1041 from luixxiul/development

smith into 2 parts