Merge pull request #1 from nrgaway/multi_user

Removed pickling