cleanup
Merge remote-tracking branch 'upstream/dirty' into dirty
Merge pull request #210 from jasvir99/dirty

cleanup