iss55 finished
some master changes
merge master