Merge pull request #28 from hipsterwannabe/ashwebb

Master and routes
Merge pull request #29 from hipsterwannabe/ashwebb

Changes to script.