Changes made at hv-office on 10-08-13
Minor changes
Merge changes made at hv-office