Up and running again
Merge pull request #8 from meriko/master

Up and running again