Merge pull request #46 from MarkTonkinson/master

Fixed Login and Setup