Add package, fix compiling errors, add reference
Merge branch 'master' of https://github.com/anpar/1243