Merge pull request #163 from jix/make_improvements