Version 1.1 Needs bugfix