1.0.5 version
Merge pull request #18 from DaQwest/feature

1.0.5 version