adding latest changes
Merge pull request #8 from clemtine/kaija

adding latest changes