Merge pull request #5 from mbrio/master

Fix a bug brought on by refactoring