Fix reverted pull request 31

@kelvinst Check out http://ec2-174-129-39-10.compute-1.amazonaws.com/ for a working example and tell me what you think?