update master #78

Closed kevinkreiser closed 9 years ago