merge fix for issue #60 by gu3st
changes in 0.5.1