Merge pull request #622 from hcavarsan/hcavarsan/issue-547-analysis