Should fix issues 2 and 3
Merge pull request #5 from icefall5/master

Should fix issues #2 and #3