Merge pull request #2 from stekie/test

All code is reviewed, looks fine.
must loop over keys() of dictionary since dict is modified while looping
merged with stekie
merged from stekie
minor changes
Merge branch 'master' of github.com:ralhei/selexe
minor changes
minor changes