fixed arg
added alias for complex numbers
Merge branch 'develop' into gh-pages