Fix bug #18
Fix bug #14
Fix bug #17
Update version
Merge branch 'master' into sql_server
Change data layer to sql server