commit fixes #6 and separates mac from encryption

MAC is temporarily removed, will be back later