complete feature
Merge branch 'write_decorator'

screwed up somehow
fix conflict; merge master