Fixing some variable naming
Merge branch 'release-0.2.1-alpha'