Minor bug fixing
Merge pull request #28 from cassiopaia/master

Minor bug fixing