Fix getter and setter
Merge branch 'master' of github.com:tronghieu/flywheel-framework