fix #17
Merge branch 'alpha'