fixing
fixing
Merge pull request #2 from clam4/master

Fixed problems