Merge pull request #442 from dshurt/v1.1

V1.1