Merge pull request #97 from bombela/master