2014-11-25-02

Commit after integrating contribution from Ian Sanford