Fixed issues 207, 208

git-svn-id: http://graph-studio-next.googlecode.com/svn/trunk@298 c2f33eb2-41b2-391d-4cb4-d9d0608729ba