Merge pull request #213 from hcgpalm/master