Merged #7 & #5 for full-fun#5

Open

valerio-bozzolan wants to merge 2 commits into

LegolasTheElf:masterfrom

valerio-bozzolan:master

Commits on Oct 1, 2014

Rewritten options section
henryx
committed

Commits on Oct 2, 2014

Added GPLv3 disclaimer;
valerio-bozzolan
committed