Merge pull request #225 from Alexpux/develop

Swap markers and logs name.