Merge branch 'development' of github.com:Ridzhi/Valium into development
Merge branch 'development' of github.com:Ridzhi/Valium into development