Fixed #2, Fixed #5. Added sorting based on timestamp
Added updated src to match changes
Merge pull request #7 from thinkallabout/develop

Pulling into master