fixed #18
Merge branch 'master' into deploy