Fixed minor bugs.
Merge branch 'test' into dev