008 update + 474
Merge pull request #40 from stumbler/master

008 update + 474