Merge pull request #204 from skyboy/master

Conveyer @Implementable
Kill some warnings
Spergy variable rename