fix #15 phew that wasn't so bad
a lil more succinct printing
Merge remote-tracking branch 'origin/master'