Rest looks good.. Please update pull-req and I will do some more tests and then merge in :)