Testing, testing...
Merge pull request #3 from mpi2/master

Testing, testing...