Added comments
Moved parsing args in function
Merge branches 'master' and 'topic'
Fixed bugs
Added check for -b args
HZ