Merge pull request #26 from ansell/master

thanks @ansell for adding