Imported Upstream version 3.4
Merge pull request #5 from mark0n/upstream

Imported Upstream version 3.4