Fix errors and add preloading functions
Merge branch 'master' of https://github.com/winnlab/Shake