Merge pull request #2 from tvardy/master

Some quick fixes