Whoops. Forgot more files
Merge pull request #3 from ekyauk/user_branch

Whoops. Forgot more files