Updated to version 1.1 with additional features