Fixing problems
Merge pull request #2 from eschow/master

Fixing problems