Merge pull request #111 from Senseg/master