Bug fixes
Merge branch 'master' of github.com:yhbrandon/nexa
Merge branch 'master' of github.com:yhbrandon/nexa