work complete
Merge pull request #591 from bazz2/master

work complete