Fix bug. Another approach to packaging.
Merge remote-tracking branch 'origin/master'