Merge pull request #24 from siroken3/devel

Devel
Merge branch 'master' of github.com:siroken3/floccus into devel