Merge pull request #2 from tarsius/master

follow header conventions,
slight changes of comment section. not fully developed yet.
comment-section improved.