resolved #36
Merge branch 'master' into dev