Different enhancements 

Pull request to close issues #3, #23 et #25