Merge pull request #872 from akbargumbira/develop

Fix yoda's variable name.
Merge pull request #873 from akbargumbira/develop

Fix failing test.