Merge pull request #461 from dshurt/master

V1.1 Release
Merge pull request #462 from di2e/master

Master