Merging with master.
Merge remote-tracking branch 'upstream/master'
Latest working code on Dans local.
Merge pull request #39 from dgarzon/master

Latest!