fixing minor bugs
Merge origin/master
print functionality and design :)