fixes #27
Merge branch 'master' of https://github.com/250gRice/250gRice.git
renamed function names