merging master with some new stuff