Merge pull request #2 from gustavjp/master

Added U4 and fixed U3
Solved U5 with a haxxy addition of a -d or --distribution flag
Merge pull request #3 from nllptr/master

Solved U5