committing stuff!
Merge pull request #4 from MikeESL/master

committing stuff!