Merge pull request #7 from aogilvie/v3.0

v3.0 update