Updating to 2013.07
Merge pull request #34 from andylyall/develop

Updating to 2013.07