Issue 602

git-svn-id: http://vosao.googlecode.com/svn/trunk@1170 d7b8a73a-866d-11de-bed6-6d316fbe0868
issues 601 & 602

git-svn-id: http://vosao.googlecode.com/svn/trunk@1171 d7b8a73a-866d-11de-bed6-6d316fbe0868