Merge pull request #8 from minsh/dev

Dev fix for issue #3