Merge pull request #2 from martin-williams/master

merging martin changes