Fix for issue #131 (from official repo). Tested and working.

Although #130 could be better fix, but i haven't tested it personally.

Tested on a fresh Fedora 20 x64, working.