Merge pull request #99 from goranche/v1.0.x

merged changes from master