Merge pull request #30 from nickebbutt/master

Pull merge of emergeo and Nick's latest
Merge remote-tracking branch 'github.com/master'