Added first "unit" tests. More integration tests really.
extra output and fixed bug in blue
Merge remote-tracking branch 'origin/master'