#26,#30 Bugfix
Merge pull request #10 from oh240/dev

#26,#30 Bugfix