robrich Merge pull request #6 from EsrefDurna/master