merged with master

Merged in changes from master.

NOT tested, as of now.. will do that later today.