Merge pull request #2 from spitters/trunk

Trunk
Merge pull request #3 from spitters/trunk

Trunk
Merge pull request #4 from spitters/trunk

Trunk
Merge branch 'trunk' of https://github.com/c-corn/corn into trunk