1.1 : merged pull requests from ethul and dgurkaynak

tested with success