Version 1.1

Just noticed that this code can be shrinked :)