changed again
Merge pull request #11 from dyrehauge/master

changed again