Last cleanups
Merge pull request #65 from SableRaf/develop

Last cleanups