malcolmstill Merge pull request #56 from malcolmstill/develop …