fixed Issue 26
added test