Merge pull request #71 from sbliven/master

Fix #70