Bugs fixed in getter functions
Merge branch 'master' of github.com:tahoang/dx