just a sample commit
Merge pull request #1 from wolberd/aug15

just a sample commit