Get local version running straight out of the box
Merge pull request #137 from andylolz/master

Get local version running straight out of the box