Nothing really
Merge remote-tracking branch 'upstream/master' into vb573
Fixed some bugs
Merge remote-tracking branch 'upstream/master' into vb573
Merge pull request #649 from balabhv/vb573

Fixed some bugs