Fixed Issue #58
Merge branch 'master' into barz-master