Merge pull request #1 from sall/master

sync sall to mem (I hope). Not sending anything to SALL/Vixen.