fix #4
Merge branch '#4'