Merge Pull Request #94 from davetayls