Merge branch 'master' into seed
Merge pull request #10 from gsperka/seed

Merge branch 'master' into seed