Merge pull request #29 from richard42/develop