michaela fixes
Merge pull request #9 from rolz/master

michaela fixes