Modified names order — See issue #2
Corrects bug #1
Merge branch 'master' of github.com:masalthunlass/complex