20130806.1

Addressed a lot of issues w/previous version - should be fairly stable
now.