fixed bug
merge
applied pr/12