closes #8 

id:522 comment:tet