Edit warnings
Merge pull request #13 from Drorzz/develop

Develop
Edit warnings
Merge pull request #14 from Drorzz/dev-drorzz

Dev drorzz