various changes
Merge pull request #49 from wolberd/july14

various changes