Merge branch 'iss19' into develop; this closes #1
fixed bug in lock-in driver (#32) and improved scan error handling
Merge branch 'develop' into iss19