Added @Log feature
resolves #13