merge
update
changed logging
updated logging
update
update
Merge pull request #3 from mkey0bc/dev

Dev