Merge pull request #35 from mikey179/master

work for 2.3.0
update to stable versions