Fixed the buffer loading bit
Merge branch 'master' of https://github.com/Apalatn/Shiva