Merge pull request #4 from geraldcor/master

iOS now in workable state.
Merge remote-tracking branch 'upstream/master'

Merge after confliciting updates. Woops.