fixed #23
Merge branch 'master' into deploy