minor fix
refactor
fizes
Merge pull request #52 from xduo/staging

minor fix