Merge branch 'hotfix/ambiguouscolumn'
Merge branch 'release/1.0.2'
Fixed issue #24
Merge branch 'hotfix/issue-24' into develop