Merge pull request #2 from BIAINC/dev

Logging
Proper handling of arguments