added more output
merged changes with master