#24 Bugfix
Merge pull request #9 from oh240/dev

#24 Bugfix