Merge pull request #1 from shimmerproject/master

update things
complete the variable name
Merge pull request #182 from m-e-h/master

complete the variable name
Fix frames
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'