Merge pull request #45 from kreczko/dev

fixes for some packages (reordering + adding dependencies)