2nd commit
2nd commit
Merge branch 'master' of https://github.com/b0nd/SHIVA

Code uploaded on git