updating from master #6

Closed Alphablackwolf closed 7 years ago