Merge pull request #50 from Toops/master

Sync
Merge pull request #56 from Toops/1.6.4

Merge pull request #50 from Toops/master