better @ support
release 0.1.3