Merge in etiquette, solves #7.

Signed-off-by: Patricio Reboratti <darthpolly@gmail.com>