added certain state drop functionality
Merge remote-tracking branch 'upstream/master'
Merge pull request #89 from jpecht/master

added certain state drop functionality