Merge pull request #1 from vpillinger/master

Added File Header + JavaDoc