Merge pull request #1 from nmpgaspar/Experimental

Painless merge
cleaned a bit
Painless clean
Painless clean
Painless clean
Painless
Yes Yes Merge branch 'master' into Experimental

Conflicts:
	Makefile
	Operation/Compliance.v