Preparing for merge
Merge branch 'awan'
Adding visualization functionality into master.