fixed #58
closes #59
fixed #60
fixed #61
fixed #62
Merge pull request #67 from kosen-venture/bugfix

merge #58, #59, #60, #61, #62