Snapshot 20140130

This version is possibly unstable and may contain incomplete features. Please use responsibly.