fixed #5 Q(ai:yk)
Merge branch 'iss-5'