Rework
Merge branch 'master' into debian
Minor bugfixes
Merge branch 'master' into debian
Added rpm spec