Fix not working, and refactor
update doc
Merge pull request #15 from kenjiskywalker/fix_not_working

Fix not working, and refactor