Studying & Working In Thailand

Hi,

I have a question which I think maybe some of you can help me with. I am a canadian who came to Bangkok to study (master degree) 2 years ago. I got a Non-Immigrant ED visa at the moment (still valid for about 1 year). I want to start working before I can't afford a living here. The thing is, I don't want to work as a teacher (not qualified at all). My field of work is computer programmer/analyst.

Now what I wonder, is if I can actually work as a programmer with a Non-Immigrant ED visa? Or I need to cancel + get a new one (something like Non-Immigrant ????). Or maybe the question is... can I get a work permit with a Non-Immigrant ED visa (ed is for education I guess). From what I understand (and I might be wrong) this ED visa is for students or teachers. Oh I should mention also that my study are not finished yet. I still have at least 1 year of study to write a thesis

So basically, can I study + work in Thailand at the same time? and what kind of specific visa do I need?

If somebody can give me some information, that would be great. Thank you.