Merge Flowdalic/Smack