Merge pull request #11 from AlexWyrm/master

Basic objects for multiple users and test fixes
Reduce technical debt