some changes
asome changes
Merge pull request #1 from celesteh/master

minor fixes