aesthetic updates and merging
merge changes
Merge branch 'master' of github.com:tnunamak/bvio-2014