pushed to v1.1

cleaned up the code