Updated Dev Branch

Updated and synced Current Version of Amossoma