removed debugger statements
Merge branch 'development' of https://github.com/broql/zap into development
Merge branch 'development' of https://github.com/broql/zap into development
code improvements, fixed program args
Merge branch 'development' of https://github.com/broql/zap into development