Merge pull request #617 from Windower/4.1-dev

1/4/2014 Pull
Merge pull request #618 from Windower/4.1

Merge pull request #617 from Windower/4.1-dev