changes

Added One Plus One support
Up to date with latest commits