Merge ISSUE#24 - Add Authentication

This merges Issue #24 into master.