Merge remote-tracking branch 'origin/ticket/3'

 * fixed #3