closes #58
Merge branch 'master' into feature/mssql