Update Issue 250

fix + non regression test

(cherry picked from commit 4295437a866dc77d7c3bd21fa9e76b24be75f1fd)
Fixing test and Adding AGPL License

(cherry picked from commit f869c460463793546058d5d2efd02cb757088de5)