Merge pull request #13 from korczis/devel

Basic capify
Better capify