Merge pull request #100 from goranche/v1.1.x

merged changes from master