Improved print function
Merge branch 'develop'