Fixes #6.

Also included two files with comments as a test structure proposition.