Commiting changes re issue5 without clobbering previous merge
Merge pull request #17 from makehackvoid/issue4b

Merging authentication changes from branch issue4b.