Updated file names
Fixed errors on ex1 and ex2
Merge pull request #1 from troykershaw/master

I've only looked at the 'post' code for a few of the modules
Merge pull request #1 from jorgef/master

Merge from upstream