Merge pull request #1 from LichK/0717

717
Merge pull request #2 from LichK/0717

717
Merge pull request #3 from LichK/0717

717
Merge pull request #4 from LichK/master

717