Merge pull request #2 from cassiopaia/master

Bug fixes
reword