merging again
still merging
still merging
still merging
Merge pull request #21 from Kierz/master

Merge #6