Merge pull request #1 from hatboysam/master

Base update
Fix mistakes of previous commits + timestamp = long
Merge pull request #23 from jamesst20/master

Fix mistakes of previous commits + timestamp = long + huge story binding change