update master #61

Closed kevinkreiser closed 9 years ago