fixed issue #6
Merge branch 'dev' of github.com:WingLongitude/liger-data-access into dev