Version 1.1

Works much better now