Several changes
Merge pull request #25 from ckuehl/updates20140806

Several changes