Merge pull request #34 from vmoravec/master

Build with opensuse-13.1