Merge pull request #2 from ptx/development

Development
Merge pull request #6 from ptx/development

alpha user_timeline
Cleaning up initial release
Merge pull request #7 from ptx/master

Master