Merge pull request #349 from Cipa/develop

#348 + sort docs style fix
fix for #337